Auto merge of #1770 - alexcrichton:shell, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 1 Jul 2015 00:41:14 +0000 (00:41 +0000)
committerbors <bors@rust-lang.org>
Wed, 1 Jul 2015 00:41:14 +0000 (00:41 +0000)
commit89435c48f95e604d7bfa7236dec7db1ae986dc3d
treeec432fc8e7b0fd5f5a668a61a50ced95304da691
parent4e5fdcd657c324193f072b70a731b692acbc5f77
parentea41f5c7fcb34dc5820dbb1b46459a6325ad5fce
Auto merge of #1770 - alexcrichton:shell, r=alexcrichton

Tweaked version of https://github.com/rust-lang/cargo/pull/1673.